From 748bc65504f9cb64efa073ecad83548036dd021a Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 30 Jun 2025 15:36:32 -0400 Subject: [PATCH] sysroot: Remove now-spurious assertion change from soft reboot changes We fixed the bug that caused soft reboot to trip the assertion here, so revert back to a hard check. --- src/libostree/ostree-sysroot.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/libostree/ostree-sysroot.c b/src/libostree/ostree-sysroot.c index f9955ce2..4cf388bc 100644 --- a/src/libostree/ostree-sysroot.c +++ b/src/libostree/ostree-sysroot.c @@ -1140,18 +1140,7 @@ _ostree_sysroot_reload_staged (OstreeSysroot *self, GError **error) if (!self->root_is_ostree_booted) return TRUE; /* Note early return */ - /* In normal cases, we should have a booted deployment. However, during - * soft-reboot scenarios, the current deployment may not correspond to - * any bootloader entry, so booted_deployment could be NULL. */ - if (!self->booted_deployment) - { - /* Check if we're in a soft-reboot scenario */ - if (!(g_file_test ("/run/nextroot", G_FILE_TEST_IS_DIR) - && g_file_test ("/run/nextroot/sysroot", G_FILE_TEST_IS_DIR))) - { - g_assert (self->booted_deployment); - } - } + g_assert (self->booted_deployment); g_clear_object (&self->staged_deployment); g_clear_pointer (&self->staged_deployment_data, g_variant_unref); -- 2.30.2